Added marker to identify the extension forms used in queries