Work in progress - Fix search in presentation mode