Fixed some errors with filtering empty on futures