Fix for query class, will only fetch wanted row now