No token base partitioning, when partitioning keys are used in 'where' 

This fixes #37 and #50