Clean up a bit
Make search a bit more responsive