Improved Search Query slightly