AMGA-15, added ts tag
-- AMGA-15, added extra where clause for F9-11