Meeting the same problem, @where clause can be added in top entity but it is not very convenient. Would be nice to have a fix.