Committed changes
Merged in changes
Added unit measurement to image site. Added filters to custom field text.