various bug fixes
additional bug fixes
Merge branch 'shashank-test' into richard-test
minor bug fixes
fixed bug with property list filtering