Partial fix for AME-3016, AME-3017

Update queries for issues related to maintenance releases