#1158 Changes for future queries, rename methods, remove old logic