Fixes #79,#73 & #46. Refactoring of slice queries