956616: Prevent users from filtering by id and date/type
Merge pull request #3035 from daviddavis/temp/20130925144217

956616: Prevent users from filtering by id and date/type