filter_by_annotation improvements

[josenimo]

• Should not use "class_name" as default, has lead to issues
• Should allow for inside a shape, or in contact with a shape