Added proper searching