Improve fluidiy selectors