Merge pull request #2309 from mitraj/release-6.6.3.a1

Added static text in Messages properties file.
Modified filter values based on Api request parameters
Merge branch 'release-6.6.3.a1' of https://github.com/Gooru/Gooru-Web into release-6.6.3.a1