Cleaned up, inlined dragged query into moved query.