fix add controls and search with the correct escape