Fixes for character search