Improved search
Improved search & server