just reformatted.
removed warnigns.
removed warnings.
removed warnings of un-used code.
removed warning.
Changed the advanced filter method so that we pass the filter string to
it. When using jpa filters we need the original string.