includes with persistent select

references: 11773 and perhaps 11036

This solves the issue by merging the selects. 
All tests run locally, but I am not too sure whether this won't break anything. 

Please advice …