Merge pull request #431 from timschofield/develop

Fixes the brought forward balance when individual tags are selected
Fixes bug preventing order input working
Merge pull request #432 from fahadhatib/develop

Fixes bug preventing order input working