reduce num of FilterOptionsRequest includes

Change-Id: I403bb7b96e8bcaa6138cdd9be823657bc47fa7ca