[TASK] Complete Search Query with location properties