Improved speed of several queries
Updated datejs