Issue #173: Extract uppercase field name variable.
Issue #173: Allow Shape_Length/Shape_Area field if defined by user.
Merge branch '#173/allow-shape-length-and-shape-area-fields-in-query-and-search-widgets' into develop