Partial fix to issue#52- resource filtering problems.