Search

Code improvements