fix bug with filtering
remove hackish way of choosing object