Content Search: Fixing various bugs