Remove ETP specific code from search package. Also trimming "index" from all ETP urls could quite possibly trim something uninteded. The correct course of action would be to handle this in the ETP URL service contract using file commands to get just the filename if it exactly matches index.