better handling in search queries