Added filters to allow for variable start and end characters.