Resolve issue related to indicator query builder

Make both side validation FE and BE

Managed by Argusoft India Ltd.