Improved context regex to handles @ and @@ pricing