Working on search
Bug fixes