Searchbar fix by Squashedpotatoe, and more bug fixes