Home National FG to include religion, ethnicity in 2018 census