Added simple search logic;