caching and query logic
tweaked routing, updated queries