Fixed restricting GSF ID in some cases

Refs #1374