pg hstore check changes + include fix