Fast search and bugfix