Fix performance issues.

[fiveohhh]

Taking almost 2 seconds to server the page. Need to figure out what the hold up is.

[fiveohhh]

Have a lot more work to do on this after old database was merged into this one. All queries now slow again.