Reduced amount of queries to bare minimum