PIM-1245 : Fix sort channel feature
PIM-1245 : Fix some behat tests