Queries for Issue #481
Fix for an Issue #495