Eliminate warning
Hide surface and rating fields if there are only one option
Change the cursor as if it's a link when we hover over JS targets
Remember field selections for adding a second set
Eliminate warnings
Merge remote-tracking branch 'upstream/master'