Improved search, fixes remove