Inland waterbody mapping: towards improving discrimination and extraction of inland surface water features