PR: MNG-1296 Submitted by: Edwin Punzalan Reviewed by: Brett Porter use scope filter and optional flag instead of hard coding