Added capture listener to set changing values before each capture and fixed bugs with extra and tags
Merge