Aguila theme - search - qa fixes