Fixing the Query-Follow functionality...