[SD-1063 Parametric search form mark-up]

Updated mark up