Fix all boolean AND to logical AND that caused multiple issues