- Major refactoring and reformatting just before ListSearchText fix