Remove / consolidate queries and adjust indexing to optimize user api
performance.