Swap included fields and parameter columns, rename "Fields", simplify context selection (using data attributes)

This commit also fixes #1181
Switch Data Source context based on data attributes
Fixing context based select box options