Merge pull request #9 from Edzelopez/AMGA-5

AMGA-5 POST QA bug fixes and modifications
AMGA-13 Fix for custom field